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

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

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