Merge changes from topic "tc_change_23042206_40" into udc-dev am: 4ecf9ca1...

Merge changes from topic "tc_change_23042206_40" into udc-dev am: 4ecf9ca1 am: 7d5f0345 am: d4a39b9b

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



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