Merge changes from topic "tc_change_23050307_34" into udc-dev-plus-aosp am: 3878e947 am: 2cd0c5a5

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



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