Merge "cameraservice: Deprecate triggerId tags"