Merge changes from topic "tc_change_23042206_36" into udc-dev am: 15722475...

Merge changes from topic "tc_change_23042206_36" into udc-dev am: 15722475 am: 673cc13f am: c86ca34c

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



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