Merge "Fix HalGatekeeperHidlTargetBasicProfilingTest."