Merge changes from topic "am-5bd86d073a4d4a268d199be7b0a9e1bc" into udc-d1-dev-plus-aosp am: 6b17912b

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



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