Merge changes from topic "am-6558352ede11458480664f3efb34ecb9" into...

Merge changes from topic "am-6558352ede11458480664f3efb34ecb9" into udc-d1-dev-plus-aosp am: 73400d5d am: 7e262d64

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



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