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

Change-Id: I3d4e7f461efba4f50f261d8b6f6872190ba4c2a5