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

Change-Id: I02e977b586169a70a0f98cdcb2a0fdc54a712097