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

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



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