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

Change-Id: I125637d6605822c30974ae94b26ab91b9501002b