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