Merge changes from topic "tc_change_23032218_16" into udc-dev am: 3049e782

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



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