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

Change-Id: Ib1734b1826e29143bdf7b4d0d9c8acfe9f259ad7