Merge changes from topic "am-3eba3cab2deb434386a0c57c8e0c7c03" into...

Merge changes from topic "am-3eba3cab2deb434386a0c57c8e0c7c03" into udc-dev-plus-aosp am: f12054bd am: f5d4048a

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



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