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

Change-Id: I6d7be5a8e2702d655548944c739f8d8d90451efe