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: afaa2943 am: 5db7cf15 am: 64e2ba7a

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



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