Merge changes from topic "tc_change_23042206_39" into udc-dev am: 90a2e457...

Merge changes from topic "tc_change_23042206_39" into udc-dev am: 90a2e457 am: 85d1f0a2 am: ddd43876

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



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