Merge changes from topic "tc_change_23040307_22" into udc-dev am: 21c2384e am: 94d86f22

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



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