Merge changes from topic "am-5cbdceefcc62468686244e3c418fa866" into...

Merge changes from topic "am-5cbdceefcc62468686244e3c418fa866" into udc-d1-dev-plus-aosp am: b236d4d9

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



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