Merge changes from topic "tc_change_23031509_16" into udc-dev am: 2e9a61eb am: 13486e20

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



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