Merge "Map AIDL Gatekeeper to same policy as HIDL version"