Merge changes from topic "tc_change_21" into tm-dev am: 7bd6d9e1d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18108551 Change-Id: Id5e0ad086ce4ab9718baea923b2f5577c9501747 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: