Merge "Add support for FEATURE_NFC_ANDROID_BEAM" am: 6827785e52
am: 39845367ab

Change-Id: Ia7fc968221a6eb314a9ee384e0dd84d3aa0e84b4