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

Change-Id: I540f0f05194cb9cb0eb60fafd29b62b50657a020