Merge changes from topic "am-44edb64d50f3467493dc6c418b2e5553" into...

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

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



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