Merge "nfc(api): Restore behavior from Android T" into udc-dev am: 004bbcdb...

Merge "nfc(api): Restore behavior from Android T" into udc-dev am: 004bbcdb am: 872042dd am: 7b1e88ff

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



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