Merge changes from topic "am-80506931186c43c8bfbe69f81ddc8ceb" into udc-d1-dev-plus-aosp am: 46298797

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



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