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

Change-Id: I486e175b504da9dbd250c24fdcb9dfbe85902de2