Merge "camera3: Update CameraMetadata vendor tag handling."