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

Change-Id: I4ccab556c613893fdaa975be4c8d18717b8e352c