Merge "Update the padding of MainSwitch layout and the MainSwitch's TextView margin to meet the spec." into sc-v2-dev am: 20e71a637f am: c8617ccd65

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16387797

Change-Id: Id0d3c67aa47c3cc83ce44ccf553f88a8e2d029e1