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

Change-Id: I08d4bb356ef07c3e325493f51731e3c21e6b1e93