Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e9863 am: d326b911 am: 5410535c

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



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