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

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



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