[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: 42431ea1 am: 7be05ac3 -s ours

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

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



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