Merge changes from topic "tc_change_21" into tm-dev am: a81e4a06 am:...

Merge changes from topic "tc_change_21" into tm-dev am: a81e4a06 am: ca688ab7 am: 3a543602 am: a30b464a

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



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