Merge changes from topic "tc_change_20" into tm-dev am: f952acfc am: 6ed81499

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



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