[automerger skipped] [Provider Model] Fix the toggle's size and dialog's width am: b17c58a7 am: 43504389 am: 0cc467c8 -s ours

am skip reason: Merged-In Ifb79e402540b4aef58f829312e836b4f11114a5d with SHA-1 3f4bddc3 is already in history

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

Change-Id: I81e7cc7a003ea6d404d96fa7af3bf5f416988058