Merge changes from topic "tc_change_22080720_11" into tm-dev am: 8df08f2b...

Merge changes from topic "tc_change_22080720_11" into tm-dev am: 8df08f2b am: 37014009 am: d4f235fe

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



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