Merge changes from topic "tc_change_23042206_42" into udc-dev am: f9c4e556

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



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