Merge "nfc(api): Add OEM extension surface" into main am: baf33d2f1f

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

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