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

Change-Id: I1bdda0fcb3d3fe35fdc9f4101bc85e00b2d04c7c