Merge changes from topic "am-bffb9ddeb0de4c15a168076e3071b9c6" into...

Merge changes from topic "am-bffb9ddeb0de4c15a168076e3071b9c6" into udc-d1-dev-plus-aosp am: 5e451e83 am: 10566543

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



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