Merge "Skip carrier priv check for trusted UIDs" into rvc-dev