Merge "Fail only if CONTROL_PRIVAPP_PERMISSIONS_ENFORCE"