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

Change-Id: I254be917b8a3269f81041ea891cdba5f782711b6