Merge changes from topic "tc_change_23042206_42" into udc-dev am: f9c4e556...

Merge changes from topic "tc_change_23042206_42" into udc-dev am: f9c4e556 am: 926d168e am: 58b3c46b

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



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