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

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

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