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

Change-Id: I75f221c9fe2d869e269b2ff375456041c973166b