Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into...

Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp am: 5e509c92

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



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