Merge changes from topic "am-bf5c0a3c14b74e2d967841198557db9f" into...

Merge changes from topic "am-bf5c0a3c14b74e2d967841198557db9f" into udc-dev-plus-aosp am: 0b5edfa1

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



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