Merge changes from topic "tc_change_23042206_35" into udc-dev am: cafdcda5 am: e603d54b

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



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