Merge "Remove status bar manipulation from EmergencyDialer" am: aef9f07702 am: 2d586ef9e0
am: 30174c13e3

Change-Id: Ia8489c795b4e1c931eaf0bac789944b84b7604cb