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

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



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