Merge "Revert write secure settings permission protection level." into mnc-dev