Merge "nfc(api): Restore behavior from Android T" into udc-dev am: 004bbcdb14 am: afaa294324
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23755172 Change-Id: Ibbc824a764786fa7db5622c39b42a1efd5dc6399 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: