Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3  -s ours
am: b6ba151a6f  -s ours

Change-Id: Idc2edc2fe727a5054c2bafb2ab01cbdfdc5a9d71