Merge changes from topic "am-99a4f1e9b37341c68410eecb699d0497" into...

Merge changes from topic "am-99a4f1e9b37341c68410eecb699d0497" into tm-d1-dev-plus-aosp am: 793c4cf4 -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/+/18704664



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