Merge changes from topic "tc_change_21" into tm-dev am: 10ee4528 am: b7c76c4a am: 39119121

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



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