Merge "Removed dividers from Phone Settings (2/2) redo" into tm-dev am: 209788d466 am: ed203dc77c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/17573625

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