Merge changes from topic "tc_change_23042206_43" into udc-dev am: acc1e1b6 am: f80260a4 am: 67466e95

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



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