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