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

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



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