Merge changes from topic "tc_change_23030910_17" into udc-dev am: da2c76b9e1 am: d1b10e43d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21923041 Change-Id: I74002401741e52e787b81e2b6e882a4e8c2aa72d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: