Merge changes from topic "am-0044f066ae544b2db72e3759316cdaf7" into...

Merge changes from topic "am-0044f066ae544b2db72e3759316cdaf7" into udc-d1-dev-plus-aosp am: 6005ecd5 am: c48d985f

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



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