Merge changes from topic "am-ec3a0df1a3ad4988a88c684ab54bac09" into tm-d1-dev-plus-aosp am: 4d20ef33 -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/+/18704656



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