Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into udc-d1-dev-plus-aosp am: 0fcc6ee4

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



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