Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
am: 6827785e52

Change-Id: I7c71bad831892bf9a853ca5d4777e42c1b3a9171