Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e9863...

Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e9863 am: e582a120 am: b9d7a3a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967



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