Merge changes from topic "am-44edb64d50f3467493dc6c418b2e5553" into udc-d1-dev-plus-aosp am: 8bd6d9f9 am: e5248ba7

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



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