Merge changes from topic "am-0f4ef66585244cf585bc2108c84c3925" into...

Merge changes from topic "am-0f4ef66585244cf585bc2108c84c3925" into udc-d1-dev-plus-aosp am: 1b4ab197 -s ours

am skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 2c993153 is already in history

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



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