Merge "Don't check apex when granting priv permission unless needed" into rvc-dev