Merge changes from topic "am-037069b56a1c48288aa7c1e017d2e0d1" into...

Merge changes from topic "am-037069b56a1c48288aa7c1e017d2e0d1" into udc-d1-dev-plus-aosp am: e558093c -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 e7ea4378 is already in history

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



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