Merge changes from topic "tc_change_20" into tm-dev am: f952acfc am: 04763dfb

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



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