Merge changes from topic "am-f39b0b8e936d44ca9519231bc3ff0bf5" into udc-d1-dev-plus-aosp am: 9a557608

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



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