[automerger skipped] Merge "activity(api): Flag nfc mainline API added for...

[automerger skipped] Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e am: 260277aa -s ours am: fb316913 -s ours

am skip reason: Merged-In If0b1432b78ec42a02446754ff6cf454fbb875048 with SHA-1 af27dfc3 is already in history

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



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