Merge "Fix EmergencyDialer UI when display size change" am: c84fc6d593
am: 4a2bcf2258

Change-Id: I7e3f1d0cf61d76f6a1dec4aae2cffbf2cfc7bac5