Improve NFC availability for active UIDs am: ea16ed61ac

Change-Id: Ic2d4ef3e80a8a0290d54dce63541cdbca72df63b