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

Change-Id: Ifd26d267997f73497ee200bc523db627e7e29770