Merge "Improve NFC availability for active UIDs" am: 12bf06acfa am: e04ee5e491 am: 39d8812c51

Change-Id: I5cde179e9a9bf87b23a452275e5414299785e127