Merge changes from topic "tc_change_20" into tm-dev am: f952acfc23 am: 04763dfbdb am: a667b04e12
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18215449 Change-Id: I34d0afd55eb5f833af45c19a9479004fbeb8a752 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: