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