Merge changes from topic "am-6c3e7fc607f1452d9118f418d44cf6b6" into...

Merge changes from topic "am-6c3e7fc607f1452d9118f418d44cf6b6" into tm-d1-dev-plus-aosp am: 7b5acf7c -s ours

am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a2 is already in history

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



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