Merge "Fix issue where keyguard wouldn't be dismissed" into oc-dr1-dev
am: 94f8143129

Change-Id: I3d4eac2b5d290f3c90ec9e5acb69db86272200e3