Merge changes from topic "tc_change_23042206_33" into udc-dev am: 4a647216 am: 1cd087a7

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



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