Merge "nfc: Migrate away from @hide getIntForUser"