Merge "Add READ_PHONE_STATE back to pregranted phone permissions" into rvc-dev