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

Change-Id: I69369945e8fc5c1090c8ee217b5d193f5fb1236d