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