Merge changes from topic "am-294f34add6fb4461a615dcef935f8a34" into udc-d1-dev-plus-aosp am: a6b130e4

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



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