Merge "Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am: 0c2b2d1f -s ours am: c9a9fcdc -s ours am: 273bd3b6 -s ours" into oc-mr1-dev