Merge changes from topic "am-0a50d97e34684870a09d44abd52c06d2" into udc-d1-dev-plus-aosp am: 5a8e4513

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



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