Merge "Include APK-in-APEX in PrivappPermissionsTest"