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

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

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