Merge changes from topic "am-48a3c3eac6a54d63aeb7abdb330441b0" into...

Merge changes from topic "am-48a3c3eac6a54d63aeb7abdb330441b0" into udc-d1-dev-plus-aosp am: 7e3a40a8

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



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