Merge "cameraserver: Remove framework only keys before sending capture requests to hal."