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

Change-Id: Iad525de24572ecef23e3704a33ebee043cf5d099