Merge changes from topic "am-873fae688f784c10b009f21f4800ecf7" into udc-dev-plus-aosp am: ef04f299

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



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