Merge "Add test to check if apk-in-apex is registered under correct apex"