Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-dev