[automerger skipped] Merge "nfc(api): Add OEM extension surface" into main am:...

[automerger skipped] Merge "nfc(api): Add OEM extension surface" into main am: baf33d2f am: 8d9403f3 -s ours

am skip reason: Merged-In Ia74d9e25b69fe3550b167ec83896c01a1fc569b9 with SHA-1 07cd09df is already in history

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



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