Merge "Add support for FEATURE_NFC_ANDROID_BEAM"