Merge "No need to check WRITE_SETTINGS permission in ContentProvider" into mnc-dev