Merge changes from topic "tc_change_20" into tm-dev am: 932e0369 am:...

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

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



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