Merge "Remove temp READ_PHONE_STATE fix" into rvc-dev