[automerger skipped] [Provider Model] Fix the toggle's size and dialog's width...

[automerger skipped] [Provider Model] Fix the toggle's size and dialog's width am: b17c58a7 am: 7c512bee -s ours am: 6d0be3da -s ours

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

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

Change-Id: Id0e56a6e66145809ed6c3c48ddf8934f94ec9161