Merge changes from topic "tc_change_23031706_15" into udc-dev am: f96d0f6d am: 51145636

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



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