Merge "Don't check apex when granting priv permission unless needed" into rvc-dev am: 19f8283a01 am: c6dfff9043 am: f5a0a6a0ea am: 1592ff0631

Change-Id: I27889ee97f5af2e1617e06569538d05d6e973ddd