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

Change-Id: If3463e47d9963fb81e817fa6b8b76f198ffaf36d