Merge changes from topic "tc_change_23022712_26" into udc-dev am: e0e6952a am: c015541f

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



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