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

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



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