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

Change-Id: Ib8ad350e9dc32a22c92e4bee96a0c7ca24d71aea