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

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

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