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

Change-Id: I7aa18e8587a26fed3ece96d3211493e9a2392a61