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

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



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