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

Change-Id: I74c268925610a04ad00f0f8cb7bcd2623b1b85df