This reverts commit 358fe8e508. Reason for revert: Android Auto has a test depending on the old layout of the dialog, and we need to revert until that test is updated Change-Id: I47095be8c89d5bea27de835ea3fa700e3b90b49d Bug: 205920324 Bug: 191331361
358fe8e508
17df1ff01f
4ef8d14ed7