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

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



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