Merge "Whitelist shim APEX in PackageSignatureTest"