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

Merge changes from topic "am-ab50bf5ed67942d19058a06b8197531b" into udc-d1-dev-plus-aosp am: 61c80881 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 39f57376 is already in history

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



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