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

Change-Id: I30d024c2d4e11f4e4c246b123723a00d28af78ee