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