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

Change-Id: I10636b0b3e0657c6fe7e0e5eb2125fb5a7e9b436