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

Change-Id: Ie8bb0b96a651e5751026e6e22d77cd54c663e63c