Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 am: e50bea8662  -s ours am: 4879880724  -s ours
am: 84c9c5c400  -s ours

Change-Id: I10b1d89d681e341e6b9fd35d9b604c43c7cc2bd3