Merge changes from topic "tc_change_23040307_26" into udc-dev am: 0e6d28ca am: 6fc5d6b6

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



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