Merge changes from topic "am-5d57157be386470dbb6228d78b40013a" into...

Merge changes from topic "am-5d57157be386470dbb6228d78b40013a" into udc-d1-dev-plus-aosp am: 59802d6b -s ours

am skip reason: Merged-In Idaa7280ed23076b3282c987a249259e0c38b6630 with SHA-1 49454743 is already in history

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



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