Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e53

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

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