Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev
am: 0c2b2d1f87  -s ours

Change-Id: Id0fe09b6f6ba687b6597ce2f97b6b8d83fbc4915