Merge changes from topic "am-613f99dee0ae4f63845010c4ecc6ee62" into...

Merge changes from topic "am-613f99dee0ae4f63845010c4ecc6ee62" into udc-d1-dev-plus-aosp am: ea470801

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



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