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: f4ecae19 am: e3fdfbd0

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



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