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

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



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