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

Change-Id: I0183d9fb699f38af155c3684cc74daa875c22ec4