Merge changes from topic "am-5af39130957f4da9b34443e266b30e71" into udc-d1-dev-plus-aosp am: 465adde2

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



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