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

Change-Id: I5552245368c5d09f566ded8c19e9ccce793814a7