Merge changes from topic "tc_change_21" into tm-dev am: 7bd6d9e1 am: b9764598

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



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