Merge changes from topic "tc_change_20" into tm-dev am: 932e0369 am: 90b0ddeb am: e9029ec7

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



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