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: d326b911 am: 32a00702 am: b5cf6f6e

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



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