Merge changes from topic "tc_change_23042206_34" into udc-dev am: 3dc9b90e...

Merge changes from topic "tc_change_23042206_34" into udc-dev am: 3dc9b90e am: 833d180e am: c5ac693d

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



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