Merge changes from topic "tc_change_23042206_46" into udc-dev am: 8178b081

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



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