Merge changes from topic "tc_change_23042206_36" into udc-dev am: 15722475...

Merge changes from topic "tc_change_23042206_36" into udc-dev am: 15722475 am: 22fd3232 am: 2afc2b84

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



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