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