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

Change-Id: Ic7750a2f8d0183b350e3a9ec5541f38df613fe63