Merge changes from topic "tc_change_20" into tm-dev am: c50d4b58b5 am: 86ee860198 am: 7beab799cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18215659 Change-Id: I49c96273d3bd8e44e2626ae9e63038d0b2b12c02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: