Merge changes from topic "am-e46be60a69f94073b09691de8f9db630" into udc-d1-dev-plus-aosp am: 83351057

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



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