Merge "Remove "sys.secpolicy.camera.off_" system property check"