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

Change-Id: I8a1b01e124ac1e368c90702d93d5c4fc8b2572d7