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

Change-Id: I3524ff2c47f59ecf4309e718efb4e5c643174811