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

Merge changes from topic "tc_change_21" into tm-dev am: ed80739e am: 969c0712 am: d8aefcdb am: a9c9646b

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



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