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

Merge changes from topic "tc_change_20" into tm-dev am: 7e37bbb2 am: 96521cb9 am: e1777085 am: 3d061b75

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



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