Merge "Fix activity start over Keyguard" into oc-dr1-dev
am: 82e815616e

Change-Id: I62e1b8b76ce7b63c2c66b598f4de954bf939bf8a