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

Merge changes from topic "tc_change_20" into tm-dev am: c50d4b58 am: 86ee8601 am: 7beab799 am: 98612251

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



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