Merge changes from topic "am-499dc9cadcc44270b0bb558e28ecbe88" into...

Merge changes from topic "am-499dc9cadcc44270b0bb558e28ecbe88" into udc-d1-dev-plus-aosp am: 3432a498 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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