Merge changes from topic "am-0c681d92dadc4cbd8c58dedda5c0df15" into udc-d1-dev-plus-aosp am: 28f1f88a

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



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