Merge "Add READ_PRIVILEGED_PHONE_STATE to the settings whitelist"