Merge "Disable EmergencyDialer multi window mode" am: c917adbcab am: 3174ca5fcc
am: fd64cc1bb0

Change-Id: I454e8c9ca7d1a1b89373fe8ede943460edadd144