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

Change-Id: I453d676952f885b1fc4afc21c0c11a17ae0bb90c