Merge "Check for keyguard occlusion on camera lift" into oc-dr1-dev am: e07567cc0b
am: 9a0894b930

Change-Id: I1e4a944ff83e46978cc4d15175347d0a44019ae5