Merge "nfc(api): Restore behavior from Android T (follow-up)" into main am:...

Merge "nfc(api): Restore behavior from Android T (follow-up)" into main am: 34b915e1 am: e39b9544 am: 9583aec2 am: 05da6b26

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



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