Merge changes from topic "am-29dff8356034424e877a2ec46fe899fe" into...

Merge changes from topic "am-29dff8356034424e877a2ec46fe899fe" into udc-d1-dev-plus-aosp am: f81265ba -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/+/24309763



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