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

Change-Id: I95659fa0abcfa619a88cb2d3d0e6d2ede4186a53