Merge changes from topic "am-9b939336c0334437acbd57592fc2ea1f" into...

Merge changes from topic "am-9b939336c0334437acbd57592fc2ea1f" into udc-d1-dev-plus-aosp am: 510a3f64 -s ours

am skip reason: Merged-In I8f25d7a5e47890a0496af023149717e1df482f98 with SHA-1 75fcbb37 is already in history

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



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