[automerger skipped] Merge "omapi(interface): Make it available for nfc apex"...

[automerger skipped] Merge "omapi(interface): Make it available for nfc apex" into main am: cad3cea1 am: 02070b6d am: bf87d405 am: fa22fef9 am: 8734635d -s ours

am skip reason: Merged-In Ife7098e0619b17c1f1ed3b276592207d09cdb6ea with SHA-1 5b2ce407 is already in history

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



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