Merge "Reset Keyguard when clicking emergency call button" into oc-dev
am: ff389264d9

Change-Id: I557863570a252fc84b76198a4acf0534a55af47c