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 am: ac6d602a

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



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