Merge "Fix emergency dialer is unable to be shown in doze" am: a62326ba10 am: 6fb340d5e0
am: 5f10eb4d36

Change-Id: If9b22660582ee00c00dee524aa73b5e99414f11f