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: 5410535c am: 6189cc31

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



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