Merge changes from topic "tc_change_23042206_43" into udc-dev am: acc1e1b6 am: 9b4265c7

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



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