Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3  -s ours
am: b6ba151a6f  -s ours

Change-Id: Ie26efb399e409d4ca90b434f9dbe6ee648d08c36