Merge changes from topic "am-076ed043faa04de1a4f6c59d690c55e3" into...

Merge changes from topic "am-076ed043faa04de1a4f6c59d690c55e3" into udc-d1-dev-plus-aosp am: 0ba9401e -s ours

am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history

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



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