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

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



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