Merge changes from topic "am-abd44ef8b4194f47b7732bebd5fc1164" into...

Merge changes from topic "am-abd44ef8b4194f47b7732bebd5fc1164" into udc-d1-dev-plus-aosp am: ecc5e94a -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 7444c007 is already in history

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



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