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