Merge changes from topic "tc_change_23022712_24" into udc-dev am: 21d040cd am: b61a34c5

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



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