Merge "Enforce policy for camera gesture in keyguard" into oc-dr1-dev am: daa1539a5e
am: 1f439e4bc7

Change-Id: I99b1d51c154bcda4121fd818ec17a3c90431443d