Merge changes from topic "am-81e9fdf9695d468e83a3672e148855fe" into udc-d1-dev-plus-aosp am: 43e87a05 am: b71d18e7

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



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