Merge changes from topic "am-1afc886b8fd14a75ab114701cde73403" into...

Merge changes from topic "am-1afc886b8fd14a75ab114701cde73403" into udc-d1-dev-plus-aosp am: 6f69c599 -s ours

am skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 58b32712 is already in history

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



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