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

Change-Id: Id44859e9304aae7e7460bd1ebdc16b5e9c1108e7