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

Merge changes from topic "am-af234e8d5aa1489db3f4bd70cd83f2f6" into udc-d1-dev-plus-aosp am: f88ebb89 -s ours

am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 976fd54a is already in history

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



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