Merge "Marking HIDL version of gatekeeper as optional."