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

Change-Id: I64843f355f55dd998ce17a0710f44eab3d46f280