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

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

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



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