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

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



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