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

Change-Id: I8157d308f178f2693529452f9fe83ab8442a5e73