Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""