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

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

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



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