This reverts commit 6d37fdc546.
Reason for revert: The Android Auto test has been disabled
Change-Id: Iddbe3098d79fbe33c16c2a9c06c8df4a22b49afb
Bug: 205920324
Fixes: 191331361
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