Merge changes from topic "am-4a58a380808b406c970397d83eb5ac6c" into udc-d1-dev-plus-aosp am: d1ced9dc

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



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