Merge "Remove above divider of main switch" into sc-dev am: c6e056b7f4

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

Change-Id: Ia46ba38fcccef36dd582ee7cbae718b38db08a5f