[automerger skipped] Merge "modbp: Make it available for nfc apex" into main am: cf72a89a82 am: 2132fd44a4 am: cf8df57594 am: d4ec130c19 am: 989e46bc2a -s ours

am skip reason: Merged-In Ic07ff3599d632e49f041c556e6ad2b6d13aa172c with SHA-1 ac671b76ba is already in history

Original change: https://android-review.googlesource.com/c/platform/external/modp_b64/+/2773044

Change-Id: I404ba8bad5c8bfad8a8a5adf6e1c6dc11ff46f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>