Merge "omapi(interface): Make it available for nfc apex" into main am: cad3cea115 am: 02070b6db5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773244

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