Merge "nfc: Migrate away from @hide getIntForUser" am: 31b73ad4b9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2429196

Change-Id: I07cdb5217e1f505e56da043e5ef6195cdd4f981f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>