Merge "[automerger skipped] Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e53 am: 42431ea15c am: 7be05ac3c6 -s ours" into main