Merge changes from topic "tc_change_20" into tm-dev am: 7e37bbb2 am: 96521cb9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18215652



Change-Id: I4e67b4b83d01d2f97bc282005610380c68efb1b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>